tools: Rationalise library soname versions.

 * Arrange for the sonames of libxenstore, libxc, libfsimage and
   libblktap to be set from a single place in Config.mk.
 * Bumps the soname major version number to 3.2 in preparation for
   3.2 rc1 after which we do not expect to have ABI changes.

I have not done anything about libaio and libflask.  The former is
imported from elsewhere and if we're lucky will have sane versioning
upstream.

libflask has a very small interface and I'm hoping that the XSM
authors have been keeping some ABI discipline.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Config.mk b/Config.mk
index 01644b167c6e612602db69884cda2843021e296e..c839e951c92b63420dff530b4a07321e96fc51fb 100644 (file)
--- a/Config.mk
+++ b/Config.mk
@@ -13,6 +13,9 @@ ifeq ($(XEN_TARGET_ARCH),x86_32)
 XEN_TARGET_X86_PAE  ?= y
 endif
 
+LIBRARIES_VERSION_MAJOR = 3.2
+LIBRARIES_VERSION_MINOR = 0
+
 CONFIG_$(XEN_OS) := y
 
 SHELL     ?= /bin/sh

diff --git a/tools/blktap/lib/Makefile b/tools/blktap/lib/Makefile
index f5621e1e2391f577311120b90794b64ec7d4761c..ce7e7f610b20aaac74758d83d20970558f2eedaa 100644 (file)
--- a/tools/blktap/lib/Makefile
+++ b/tools/blktap/lib/Makefile
@@ -1,8 +1,8 @@
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-MAJOR    = 3.0
-MINOR    = 0
+MAJOR = $(LIBRARIES_VERSION_MAJOR)
+MINOR = $(LIBRARIES_VERSION_MINOR)
 SONAME   = libblktap.so.$(MAJOR)
 
 BLKTAP_INSTALL_DIR = /usr/sbin

diff --git a/tools/libfsimage/common/Makefile b/tools/libfsimage/common/Makefile
index 6efce44f02f5fe475b6698cbbe1dae81ab529eca..674b5cf93a46eb5edd62b6cb39d4cab88f400258 100644 (file)
--- a/tools/libfsimage/common/Makefile
+++ b/tools/libfsimage/common/Makefile
@@ -1,8 +1,8 @@
 XEN_ROOT = ../../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-MAJOR = 1.0
-MINOR = 0
+MAJOR = $(LIBRARIES_VERSION_MAJOR)
+MINOR = $(LIBRARIES_VERSION_MINOR)
 
 CFLAGS += -Werror -Wp,-MD,.$(@F).d
 DEPS = .*.d

diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile
index 38b9aec001cf5a6fd5d325ea1c98ce0e91c6d4df..7fbd83b1fd7d3b76cd67818fb9ee88fcdaa45d46 100644 (file)
--- a/tools/libxc/Makefile
+++ b/tools/libxc/Makefile
@@ -1,8 +1,8 @@
 XEN_ROOT = ../..
 include $(XEN_ROOT)/tools/Rules.mk
 
-MAJOR    = 3.1
-MINOR    = 0
+MAJOR = $(LIBRARIES_VERSION_MAJOR)
+MINOR = $(LIBRARIES_VERSION_MINOR)
 
 CTRL_SRCS-y       :=
 CTRL_SRCS-y       += xc_core.c

diff --git a/tools/xenstore/Makefile b/tools/xenstore/Makefile
index adbe6056752d77de06158d24da84f891cdfc10ed..ff165bd5d13d47a9cb6e50363cc83dc6ecfb9502 100644 (file)
--- a/tools/xenstore/Makefile
+++ b/tools/xenstore/Makefile
@@ -2,8 +2,8 @@ XEN_ROOT=../..
 include $(XEN_ROOT)/tools/Rules.mk
 XEN_LIBXC          = $(XEN_ROOT)/tools/libxc
 
-MAJOR = 3.0
-MINOR = 0
+MAJOR = $(LIBRARIES_VERSION_MAJOR)
+MINOR = $(LIBRARIES_VERSION_MINOR)
 
 PROFILE=#-pg
 BASECFLAGS=-Werror